Update d/patches

diff --git a/debian/patches/0009-Ignore-errors-during-lconvert.patch b/debian/patches/0009-Ignore-errors-during-lconvert.patch
deleted file mode 100644 (file)
index 8bd8f7d..0000000
--- a/debian/patches/0009-Ignore-errors-during-lconvert.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Sat, 25 Jun 2022 21:22:20 +0200
-Subject: Ignore errors during lconvert
-
-Starting with qt5 5.15.4 lconvert errors with
-
-QM-Format error
-
-for some calls and thus thus fails the build.
----
- gui/package_app | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gui/package_app b/gui/package_app
-index 01c00eb..f7829f6 100755
---- a/gui/package_app
-+++ b/gui/package_app
-@@ -50,7 +50,7 @@ function convert_qt_translations()
-     inputs+=("qtbase_${language}.qm")
-     if [ -e "qtdeclarative_${language}.qm" ]; then inputs+=("qtdeclarative_${language}.qm"); fi
-     if [ -e "qtserialport_${language}.qm" ]; then inputs+=("qtserialport_${language}.qm"); fi
--    "${LCONVERT}" -o "${LANGDIR}/qt_${language}.qm" "${inputs[@]}"
-+    "${LCONVERT}" -o "${LANGDIR}/qt_${language}.qm" "${inputs[@]}" || true
- 
-     if [ "${machine}" = "Mac" ]; then
-       # Create locversion.plist in the bundle to trigger translations for

diff --git a/debian/patches/Disable-donation-nagging b/debian/patches/Disable-donation-nagging
index e2da5c9c74f71239f37b624a51c0310eea1a77bf..5a0d0868867a23d5fbeb4680926ecc843f00684d 100644 (file)
--- a/debian/patches/Disable-donation-nagging
+++ b/debian/patches/Disable-donation-nagging
@@ -1,11 +1,11 @@
 --- a/gui/babeldata.h
 +++ b/gui/babeldata.h
-@@ -67,7 +67,7 @@ public:
-     reportStatistics_(false),
-     allowBetaUpgrades_(false),
-     ignoreVersionMismatch_(true),
--    disableDonateDialog_(false),
-+    disableDonateDialog_(true),
-     donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)))
-   {
-   }
+@@ -154,7 +154,7 @@ public:
+   bool reportStatistics_{false};
+   bool allowBetaUpgrades_{false};
+   bool ignoreVersionMismatch_{true};
+-  bool disableDonateDialog_{false};
++  bool disableDonateDialog_{true};
+   QDateTime donateSplashed_;
+ };
+ #endif

diff --git a/debian/patches/gpsbabelfe_disable_version_check b/debian/patches/gpsbabelfe_disable_version_check
index 77f2c7b13d9d27c05035f3d560e4c66ed7e72665..96f5241a96b2fef5a9181d000708a635fcc144e9 100644 (file)
--- a/debian/patches/gpsbabelfe_disable_version_check
+++ b/debian/patches/gpsbabelfe_disable_version_check
@@ -18,7 +18,7 @@ Disable version mismatch check.
       </widget>
 --- a/gui/preferences.cc
 +++ b/gui/preferences.cc
-@@ -42,7 +42,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
+@@ -49,7 +49,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
  
    ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
    ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
@@ -26,7 +26,7 @@ Disable version mismatch check.
  
    connect(ui_.buttonBox, &QDialogButtonBox::accepted, this, &Preferences::acceptClicked);
    connect(ui_.buttonBox, &QDialogButtonBox::rejected, this, &Preferences::rejectClicked);
-@@ -82,7 +81,6 @@ void Preferences::acceptClicked()
+@@ -89,7 +88,6 @@ void Preferences::acceptClicked()
  
    babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
    babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
@@ -36,12 +36,12 @@ Disable version mismatch check.
  
 --- a/gui/babeldata.h
 +++ b/gui/babeldata.h
-@@ -66,7 +66,7 @@ public:
-     startupVersionCheck_(true),
-     reportStatistics_(true),
-     allowBetaUpgrades_(false),
--    ignoreVersionMismatch_(false),
-+    ignoreVersionMismatch_(true),
-     disableDonateDialog_(false),
-     donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)))
-   {
+@@ -153,7 +153,7 @@ public:
+   bool startupVersionCheck_{true};
+   bool reportStatistics_{true};
+   bool allowBetaUpgrades_{false};
+-  bool ignoreVersionMismatch_{false};
++  bool ignoreVersionMismatch_{true};
+   bool disableDonateDialog_{false};
+   QDateTime donateSplashed_;
+ };

diff --git a/debian/patches/gpsbabelfe_do-not-check-for-newer-version b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
index 3cc0a0e56b1d18a4f4446452ddcdac67d81fd55b..cc6a99ff4dfc8fe64c3721c54687a98341e9897b 100644 (file)
--- a/debian/patches/gpsbabelfe_do-not-check-for-newer-version
+++ b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
@@ -18,7 +18,7 @@ Disable check for newer versions on start.
            <property name="text">
 --- a/gui/preferences.cc
 +++ b/gui/preferences.cc
-@@ -40,7 +40,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
+@@ -47,7 +47,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
  {
    ui_.setupUi(this);
  
@@ -26,7 +26,7 @@ Disable check for newer versions on start.
    ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
  
    connect(ui_.buttonBox, &QDialogButtonBox::accepted, this, &Preferences::acceptClicked);
-@@ -79,7 +78,6 @@ void Preferences::acceptClicked()
+@@ -86,7 +85,6 @@ void Preferences::acceptClicked()
      formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
    }
  
@@ -36,15 +36,15 @@ Disable check for newer versions on start.
  }
 --- a/gui/babeldata.h
 +++ b/gui/babeldata.h
-@@ -63,7 +63,7 @@ public:
-     upgradeErrors_(0),
-     upgradeOffers_(0),
-     runCount_(0),
--    startupVersionCheck_(true),
-+    startupVersionCheck_(false),
-     reportStatistics_(false),
-     allowBetaUpgrades_(false),
-     ignoreVersionMismatch_(true),
+@@ -150,7 +150,7 @@ public:
+   int runCount_{0};
+ 
+   // Global preferences.
+-  bool startupVersionCheck_{true};
++  bool startupVersionCheck_{false};
+   bool reportStatistics_{false};
+   bool allowBetaUpgrades_{false};
+   bool ignoreVersionMismatch_{true};
 --- a/gui/mainwinui.ui
 +++ b/gui/mainwinui.ui
 @@ -691,7 +691,6 @@
@@ -69,15 +69,15 @@ Disable check for newer versions on start.
      <string>Visit Website...</string>
 --- a/gui/mainwindow.cc
 +++ b/gui/mainwindow.cc
-@@ -175,7 +175,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+@@ -170,7 +170,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
    connect(ui_.actionAbout, &QAction::triggered, this, &MainWindow::aboutActionX);
    connect(ui_.actionVisit_Website, &QAction::triggered, this, &MainWindow::visitWebsiteActionX);
    connect(ui_.actionMake_a_Donation, &QAction::triggered, this, &MainWindow::donateActionX);
 -  connect(ui_.actionUpgradeCheck, &QAction::triggered, this, &MainWindow::upgradeCheckActionX);
    connect(ui_.actionPreferences, &QAction::triggered, this, &MainWindow::preferencesActionX);
  
- // TODO: Qt6 deleted the obsolete overloaded signal QComboBox::currentIndexChanged(const QString &text)
-@@ -232,17 +231,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+   connect(ui_.inputFormatCombo, &QComboBox::currentIndexChanged,
+@@ -223,17 +222,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
    restoreSettings();
  
    upgrade = new UpgradeCheck(this, formatList_, babelData_);
@@ -94,8 +94,8 @@ Disable check for newer versions on start.
 -  }
  }
  
- //------------------------------------------------------------------------
-@@ -1010,10 +998,6 @@ void MainWindow::applyActionX()
+ void MainWindow::switchTranslator(QTranslator& translator, const QString& filename)
+@@ -1000,10 +988,6 @@ void MainWindow::applyActionX()
  //------------------------------------------------------------------------
  void MainWindow::closeActionX()
  {

diff --git a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
index d161aaed966101671a1b93e7b6bfa3a36fe1df35..400e39e6955cb0d5f08361c2f4b038e7d960d127 100644 (file)
--- a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
+++ b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
@@ -1,12 +1,12 @@
 Make statistics reporting an opt-in option.
 --- a/gui/babeldata.h
 +++ b/gui/babeldata.h
-@@ -64,7 +64,7 @@ public:
-     upgradeOffers_(0),
-     runCount_(0),
-     startupVersionCheck_(true),
--    reportStatistics_(true),
-+    reportStatistics_(false),
-     allowBetaUpgrades_(false),
-     ignoreVersionMismatch_(true),
-     disableDonateDialog_(false),
+@@ -151,7 +151,7 @@ public:
+ 
+   // Global preferences.
+   bool startupVersionCheck_{true};
+-  bool reportStatistics_{true};
++  bool reportStatistics_{false};
+   bool allowBetaUpgrades_{false};
+   bool ignoreVersionMismatch_{true};
+   bool disableDonateDialog_{false};

diff --git a/debian/patches/htmldoc-location b/debian/patches/htmldoc-location
index e47db98b38ae29584587edace58c93f384ddda90..b8c08da3239a2dce1f871e83197f70b424c38b5e 100644 (file)
--- a/debian/patches/htmldoc-location
+++ b/debian/patches/htmldoc-location
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -475,8 +475,6 @@ if(UNIX AND NOT APPLE)
+@@ -484,8 +484,6 @@ if(UNIX AND NOT APPLE)
                      USES_TERMINAL)
  endif()
  
@@ -9,7 +9,7 @@
    set(GPSBABEL_WEB "gpsbabel.org" CACHE PATH "Path where the documentation will be stored for www.gpsbabel.org.")
    add_custom_target(gpsbabel.org
                      ${CMAKE_SOURCE_DIR}/tools/make_gpsbabel_org.sh ${GPSBABEL_WEB} ${GPSBABEL_DOCVERSION}
-@@ -495,6 +493,3 @@ if((CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) AND NOT _isMultiConfig)
+@@ -504,6 +502,3 @@ if((CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) AND NOT _isMultiConfig)
                      DEPENDS gpsbabel
                      VERBATIM
                      USES_TERMINAL)

diff --git a/debian/patches/series b/debian/patches/series
index 208ecf85cc14c99d12b52e116afc19b0c44454c0..d97fc28cf2e3639bb4c406377e75b92a3cc03167 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@ gpsbabelfe_do-not-check-for-newer-version
 htmldoc-location
 Disable-donation-nagging
 0007-Add-workaround-for-failing-test-on-i386.patch
-0009-Ignore-errors-during-lconvert.patch
 0008-Ignore-test-failures-due-to-CPU-differences.patch